Packaging initial infrastructure #133
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gregkalapos
approved these changes
Jul 29, 2024
Mpdreamz
added a commit
that referenced
this pull request
Jul 31, 2024
Continues #133 This now puts all required distributions under `.artifacts/elastic-distribution`. This includes `elastic-*.zip` versions of the auto instrumentation zips. These zips include * our plugin dll (twice for -windows.zip). * `_instrument.sh` a copy of the original `instrument.sh` * `instrument.sh` which sets our plugin var and calls `_instrument.sh` This also includes elastic versions of the installation bash script and the powershell module to instrument and install/update on windows. These files should now upload as part of our release and uploaded as artifacts on each commit in main. Locally to build the distributables call: ``` ./build.sh redistribute ```` To validate the distribution there is now a new dockerfile that validates our install and instrumentation scripts: ```bash docker build -t distribution.autoinstrumentation:latest -f examples/Example.AutoInstrumentation/distribution.Dockerfile . && \ docker run -it --rm -p 5000:8080 --name distri --platform linux/arm64 distribution.autoinstrumentation:latest ``` The latter will also form the basis for more integration tests which i'll follow up with
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not complete but enough to review as part 1 😄
OpenTelemetry.AutoInstrumentationnamedElastic.OpenTelemetry.AutoInstrumentation.Through a bit of msbuild magic we redistribute
instrument.{sh|cmd}as_instrument.{sh|cmd}and introduce our owninstrument.{sh|cmd}that sets the appropiate plugin environment variable before calling the opentelemetry instrument script.This allows the invocation to be exactly the same no matter if our distribution or the vanilla opentelemetry package is installed. A user can move from or away from Elastic without having to touch orchestration work. Simply installing the package is enough to move to or away from us.
./build.sh redistributebuild command that redistributes the opentelemetry autoinstrumentation zip files that include our AutoInstrumentation plugin.A follow up of this PR will focus on creating Elastic versions of the global auto instrumentation installation scripts and ensuring these get staged as part of the release.